From 64b9d5347274c21dbe2afde5e0618635c7911ae1 Mon Sep 17 00:00:00 2001
From: Maximiliano Sandoval R <msandova@protonmail.com>
Date: Fri, 16 Jul 2021 10:43:11 +0200
Subject: [PATCH] appdata: Use launchable rather than id

<id> should be used for the component id and <launchable> for the
desktop file.
---
 demos/gtk-demo/org.gtk.Demo4.appdata.xml.in                | 3 ++-
 demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in     | 3 ++-
 demos/print-editor/org.gtk.PrintEditor4.appdata.xml        | 3 ++-
 demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in b/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in
index 2697ea0f0d..a1a468c407 100644
--- a/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in
+++ b/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.Demo4.desktop</id>
+  <id>org.gtk.Demo4</id>
+  <launchable type="desktop-id">org.gtk.Demo4.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.1-or-later</project_license>
   <name>GTK Demo</name>
diff --git a/demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in b/demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in
index f08e9d1ba7..8cfaaa2b49 100644
--- a/demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in
+++ b/demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.IconBrowser4.desktop</id>
+  <id>org.gtk.IconBrowser4</id>
+  <launchable type="desktop-id">org.gtk.IconBrowser4.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.1-or-later</project_license>
   <name>GTK Icon Browser</name>
diff --git a/demos/print-editor/org.gtk.PrintEditor4.appdata.xml b/demos/print-editor/org.gtk.PrintEditor4.appdata.xml
index 149bf3e93d..bdee5bbe67 100644
--- a/demos/print-editor/org.gtk.PrintEditor4.appdata.xml
+++ b/demos/print-editor/org.gtk.PrintEditor4.appdata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.PrintEditor4.desktop</id>
+  <id>org.gtk.PrintEditor4</id>
+  <launchable type="desktop-id">org.gtk.PrintEditor4.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.1-or-later</project_license>
   <name>GTK Print Editor</name>
diff --git a/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in b/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in
index 174d80053d..7f8c4e5617 100644
--- a/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in
+++ b/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.WidgetFactory4.desktop</id>
+  <id>org.gtk.WidgetFactory4</id>
+  <launchable type="desktop-id">org.gtk.WidgetFactory4.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.1-or-later</project_license>
   <name>GTK Widget Factory</name>
-- 
2.30.2